auto merge of #768 : alexcrichton/cargo/ssl-fixes, r=brson
authorbors <bors@rust-lang.org>
Wed, 29 Oct 2014 18:49:43 +0000 (18:49 +0000)
committerbors <bors@rust-lang.org>
Wed, 29 Oct 2014 18:49:43 +0000 (18:49 +0000)
commit502ea6e68484a5b7ea355890cadaeba58b9d7636
tree6816ac5e94b2310ee7ebdc232d7b5a51761ba9e8
parent947a62b7db0a105d7ba70d3ea77be0a21e7e1bd9
parent68345f395e239ace291f644c23ba481d711d7920
auto merge of #768 : alexcrichton/cargo/ssl-fixes, r=brson

The second commit message has the details, and these are the relevant external commits:

* https://github.com/alexcrichton/openssl-static-sys/commit/2e1c50a7f35ef52ce38dbd405a175b6dccc0ebad
* https://github.com/alexcrichton/curl-rust/commit/1098e4dd3b89b168b412dfeaba033e41796ea794